Reverse accidental commits for changesets 8001 and 7996-7999.

The Mercurial Queues extensions suddenly looks a lot less useful than it first
seemed.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
index 91ff5069aa9969254209b2c3d1ae690baeebad7b..a3efed0d05388d03bbe20ca80285b06b1c4e539f 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
@@ -155,8 +155,6 @@ struct netfront_info
           (_list)[0]  = (_list)[_id];                          \
           (unsigned short)_id; })
 
-#define DEBUG 1
-
 #ifdef DEBUG
 static char *be_state_name[] = {
        [BEST_CLOSED]       = "closed",
@@ -902,7 +900,7 @@ static int network_close(struct net_device *dev)
 {
        struct netfront_info *np = netdev_priv(dev);
        np->user_state = UST_CLOSED;
-       netif_stop_queue(dev);
+       netif_stop_queue(np->netdev);
        return 0;
 }
 
@@ -1166,6 +1164,8 @@ static void netfront_closing(struct xenbus_device *dev)
 
        DPRINTK("netfront_closing: %s removed\n", dev->nodename);
 
+       close_netdev(info);
+
        xenbus_switch_state(dev, NULL, XenbusStateClosed);
 }
 

diff --git a/tools/console/Makefile b/tools/console/Makefile
index 3fc846eb56fc647aa1767c31ea9ad1a66ee4a871..a27aa8e458e1026363ad094fab8074936bfe6117 100644 (file)
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -9,7 +9,7 @@ INSTALL         = install
 INSTALL_PROG    = $(INSTALL) -m0755
 INSTALL_DIR     = $(INSTALL) -d -m0755
 
-CFLAGS  += -Wall -Werror -ggdb3 -O0
+CFLAGS  += -Wall -Werror -g3
 
 CFLAGS  += -I $(XEN_LIBXC)
 CFLAGS  += -I $(XEN_XENSTORE)

diff --git a/tools/examples/block b/tools/examples/block
index 7ea044f4bccf44ba9adf86e3e5978349c063fc20..79636ac20aa5e2a2c4520883bd317810e8410a84 100644 (file)
--- a/tools/examples/block
+++ b/tools/examples/block
@@ -3,6 +3,12 @@
 dir=$(dirname "$0")
 . "$dir/block-common.sh"
 
+case "$command" in
+    online | offline)
+        exit 0
+        ;;
+esac
+
 expand_dev() {
   local dev
   case $1 in

diff --git a/tools/examples/block-common.sh b/tools/examples/block-common.sh
index 6c44f87c4569f80f04998797af1e882167e83848..2e4683111177bb76ac6f44d7780ecf5dd860887a 100644 (file)
--- a/tools/examples/block-common.sh
+++ b/tools/examples/block-common.sh
@@ -21,7 +21,9 @@ dir=$(dirname "$0")
 
 findCommand "$@"
 
-if [ "$command" != "add" ] &&
+if [ "$command" != "online" ]  &&
+   [ "$command" != "offline" ] &&
+   [ "$command" != "add" ]     &&
    [ "$command" != "remove" ]
 then
   log err "Invalid command: $command"

diff --git a/tools/examples/block-enbd b/tools/examples/block-enbd
index 75c6f257aa640a6ae6b39ebbf759690143364912..c58adb595d5174ef9bcc7740d7f32dc8fec7cad9 100755 (executable)
--- a/tools/examples/block-enbd
+++ b/tools/examples/block-enbd
@@ -11,7 +11,7 @@ dir=$(dirname "$0")
 . "$dir/block-common.sh"
 
 case "$command" in
-  add)
+  bind)
     for dev in /dev/nd*; do
       if nbd-client $2:$3 $dev; then
         write_dev $dev
@@ -20,7 +20,7 @@ case "$command" in
     done
     exit 1
     ;;
-  remove)
+  unbind)
     nbd-client -d $2
     exit 0
     ;;

diff --git a/tools/examples/block-nbd b/tools/examples/block-nbd
index 8c5cb17b7970e767ae77613033237f48e214fef2..142a403c0f97e60a621d80cd1a02bd070b90b786 100644 (file)
--- a/tools/examples/block-nbd
+++ b/tools/examples/block-nbd
@@ -11,7 +11,7 @@ dir=$(dirname "$0")
 . "$dir/block-common.sh"
 
 case "$command" in
-  add)
+  bind)
     for dev in /dev/nbd*; do
       if nbd-client $2 $3 $dev; then
         write_dev $dev
@@ -20,7 +20,7 @@ case "$command" in
     done
     exit 1
     ;;
-  remove)
+  unbind)
     nbd-client -d $2
     exit 0
     ;;

diff --git a/tools/examples/xend-config.sxp b/tools/examples/xend-config.sxp
index 06758f9a6b0bc1d56048141770754ab40c1e7628..f600edc19d898ad9ec8d00a9901b7229c7294557 100644 (file)
--- a/tools/examples/xend-config.sxp
+++ b/tools/examples/xend-config.sxp
@@ -34,7 +34,7 @@
 # Specifying 'localhost' prevents remote connections.
 # Specifying the empty string '' (the default) allows all connections.
 #(xend-address '')
-#(xend-address localhost)
+(xend-address localhost)
 
 # Address xend should listen on for relocation-socket connections, if
 # xend-relocation-server is set.

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 57aa64bfafebb5321210c3e6ae9584fb03890d67..08eb0c42a0f3bd755563615484d3a13f2714ef26 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -52,7 +52,7 @@ CFLAGS   += $(INCLUDES) -I.
 
 # Define this to make it possible to run valgrind on code linked with these
 # libraries.
-CFLAGS   += -DVALGRIND # -O0 -ggdb3
+#CFLAGS   += -DVALGRIND -O0 -ggdb3
 
 # Get gcc to generate the dependencies for us.
 CFLAGS   += -Wp,-MD,.$(@F).d

diff --git a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c
index b111158a954b453888cf9b7bd01a642407048b13..d61ecfa549cb17ce8480066c6755ac6b0e0435a1 100644 (file)
--- a/tools/libxc/xc_linux_build.c
+++ b/tools/libxc/xc_linux_build.c
@@ -480,7 +480,6 @@ static int setup_guest(int xc_handle,
 
 #define _p(a) ((void *) (a))
 
-#if 0
     printf("VIRTUAL MEMORY ARRANGEMENT:\n"
            " Loaded kernel: %p->%p\n"
            " Init. ramdisk: %p->%p\n"
@@ -501,7 +500,6 @@ static int setup_guest(int xc_handle,
            _p(vstack_start), _p(vstack_end),
            _p(dsi.v_start), _p(v_end));
     printf(" ENTRY ADDRESS: %p\n", _p(dsi.v_kernentry));
-#endif
 
     if ( ((v_end - dsi.v_start)>>PAGE_SHIFT) > nr_pages )
     {

diff --git a/tools/python/setup.py b/tools/python/setup.py
index 2494e53b0a39d0b914735f3d46f8cae01ea4f486..79b9730a1ae8246b5d4d6d48350d030962e7522b 100644 (file)
--- a/tools/python/setup.py
+++ b/tools/python/setup.py
@@ -4,7 +4,7 @@ import os
 
 XEN_ROOT = "../.."
 
-extra_compile_args  = [ "-fno-strict-aliasing", "-Wall", "-Werror", "-ggdb3", "-O0" ]
+extra_compile_args  = [ "-fno-strict-aliasing", "-Wall", "-Werror" ]
 
 
 include_dirs = [ XEN_ROOT + "/tools/libxc",

diff --git a/tools/python/xen/xend/XendLogging.py b/tools/python/xen/xend/XendLogging.py
index 62a1d1d37df593792b1954168e19120486b3480f..053bf4703e298f04abc3b1b61f9ed4b90799c98f 100644 (file)
--- a/tools/python/xen/xend/XendLogging.py
+++ b/tools/python/xen/xend/XendLogging.py
@@ -42,7 +42,7 @@ DEFAULT_MAX_BYTES = 1 << 20  # 1MB
 DEFAULT_BACKUP_COUNT = 5
 
 STDERR_FORMAT = "[%(name)s] %(levelname)s (%(module)s:%(lineno)d) %(message)s"
-LOGFILE_FORMAT = "[%(asctime)s %(name)s %(thread)d] %(levelname)s (%(module)s:%(lineno)d) %(message)s"
+LOGFILE_FORMAT = "[%(asctime)s %(name)s] %(levelname)s (%(module)s:%(lineno)d) %(message)s"
 DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
 
 

diff --git a/tools/python/xen/xend/server/SrvDaemon.py b/tools/python/xen/xend/server/SrvDaemon.py
index b984a67466a477f9cda3b16b09cf69829218c118..499da92f2268987a3c5ac97ed4f8c4666334741a 100644 (file)
--- a/tools/python/xen/xend/server/SrvDaemon.py
+++ b/tools/python/xen/xend/server/SrvDaemon.py
@@ -8,9 +8,7 @@
 import os
 import signal
 import sys
-import thread
 import threading
-import time
 import linecache
 import pwd
 import re
@@ -203,8 +201,6 @@ class Daemon:
                 pass
 
     def print_trace(self, string):
-        self.tracefile.write(time.strftime("%Y-%m-%d %H:%M:%S "))
-        self.tracefile.write("%10x" % thread.get_ident())
         for i in range(self.traceindent):
             ch = " "
             if (i % 5):

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 110850da2644eb8b573a8d88aa6db1cee27f5445..7b56ad497b04a5596d72dbc2a1d94b57004b8fb6 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -12,7 +12,7 @@ BASECFLAGS=-Wall -g -Werror
 # Make gcc generate dependencies.
 BASECFLAGS += -Wp,-MD,.$(@F).d
 PROG_DEP = .*.d
-BASECFLAGS+= -O0 -ggdb3 $(PROFILE)
+BASECFLAGS+= -O3 $(PROFILE)
 #BASECFLAGS+= -I$(XEN_ROOT)/tools
 BASECFLAGS+= -I$(XEN_ROOT)/tools/libxc
 BASECFLAGS+= -I.

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index a1ea5ddba476903a583502851d4d287b376e30f1..5c3a77be8398ed1307bfbf8bd7172614550a5484 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -14,7 +14,7 @@ CFLAGS  += -I $(XEN_LIBXC)
 HDRS     = $(wildcard *.h)
 OBJS     = $(patsubst %.c,%.o,$(wildcard *.c))
 
-BIN      = xentrace tbctl setsize xenctx
+BIN      = xentrace tbctl setsize
 SCRIPTS  = xentrace_format
 MAN1     = $(wildcard *.1)
 MAN8     = $(wildcard *.8)

diff --git a/xen/Rules.mk b/xen/Rules.mk
index acb2515f85a050de526784edaaef18ef0c14e51c..f9721f03a2d1b4a206d2e800b517e9d527a110b1 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -2,8 +2,8 @@
 # If you change any of these configuration options then you must
 # 'make clean' before rebuilding.
 #
-verbose     ?= y
-debug       ?= y
+verbose     ?= n
+debug       ?= n
 perfc       ?= n
 perfc_arrays?= n
 domu_debug  ?= n